From 6d93604d001f501db18c0fd2f4e9cd0bb59a60b5 Mon Sep 17 00:00:00 2001 From: Alex Williamson Date: Thu, 17 Jan 2008 12:05:43 -0700 Subject: [PATCH] [IA64] domheap: Fix current->domain->arch.shadow_bitmap reference Don't reference current->domain->arch.shadow_bitmap in dirty_bit fault handler. Instead copy it to arch_vcpu. Signed-off-by: Isaku Yamahata --- xen/arch/ia64/asm-offsets.c | 3 +-- xen/arch/ia64/xen/domain.c | 9 ++++++++- xen/arch/ia64/xen/ivt.S | 6 +----- xen/include/asm-ia64/domain.h | 1 + 4 files changed, 11 insertions(+), 8 deletions(-) diff --git a/xen/arch/ia64/asm-offsets.c b/xen/arch/ia64/asm-offsets.c index bcff616159..aefad7fd2b 100644 --- a/xen/arch/ia64/asm-offsets.c +++ b/xen/arch/ia64/asm-offsets.c @@ -56,7 +56,6 @@ void foo(void) DEFINE(IA64_TASK_THREAD_KSP_OFFSET, offsetof (struct vcpu, arch._thread.ksp)); DEFINE(IA64_TASK_THREAD_ON_USTACK_OFFSET, offsetof (struct vcpu, arch._thread.on_ustack)); - DEFINE(IA64_VCPU_DOMAIN_OFFSET, offsetof (struct vcpu, domain)); DEFINE(IA64_VCPU_HYPERCALL_CONTINUATION_OFS, offsetof (struct vcpu, arch.hypercall_continuation)); DEFINE(IA64_VCPU_FP_PSR_OFFSET, offsetof (struct vcpu, arch.fp_psr)); DEFINE(IA64_VCPU_META_RID_DT_OFFSET, offsetof (struct vcpu, arch.metaphysical_rid_dt)); @@ -79,7 +78,7 @@ void foo(void) BLANK(); - DEFINE(IA64_DOMAIN_SHADOW_BITMAP_OFFSET, offsetof (struct domain, arch.shadow_bitmap)); + DEFINE(IA64_VCPU_SHADOW_BITMAP_OFFSET, offsetof (struct vcpu, arch.shadow_bitmap)); BLANK(); diff --git a/xen/arch/ia64/xen/domain.c b/xen/arch/ia64/xen/domain.c index 0ca477f1eb..5b3cf539ac 100644 --- a/xen/arch/ia64/xen/domain.c +++ b/xen/arch/ia64/xen/domain.c @@ -1745,6 +1745,10 @@ int shadow_mode_control(struct domain *d, xen_domctl_shadow_op_t *sc) case XEN_DOMCTL_SHADOW_OP_OFF: if (shadow_mode_enabled (d)) { u64 *bm = d->arch.shadow_bitmap; + struct vcpu *v; + + for_each_vcpu(d, v) + v->arch.shadow_bitmap = NULL; /* Flush vhpt and tlb to restore dirty bit usage. */ domain_flush_tlb_vhpt(d); @@ -1780,9 +1784,12 @@ int shadow_mode_control(struct domain *d, xen_domctl_shadow_op_t *sc) rc = -ENOMEM; } else { + struct vcpu *v; memset(d->arch.shadow_bitmap, 0, d->arch.shadow_bitmap_size / 8); - + + for_each_vcpu(d, v) + v->arch.shadow_bitmap = d->arch.shadow_bitmap; /* Flush vhtp and tlb to enable dirty bit virtualization. */ domain_flush_tlb_vhpt(d); diff --git a/xen/arch/ia64/xen/ivt.S b/xen/arch/ia64/xen/ivt.S index b9eb05e50c..5803a2dfda 100644 --- a/xen/arch/ia64/xen/ivt.S +++ b/xen/arch/ia64/xen/ivt.S @@ -394,11 +394,7 @@ ENTRY(dirty_bit) ;; ld8 r22=[r22] ;; - add r22=IA64_VCPU_DOMAIN_OFFSET,r22 - ;; - ld8 r22=[r22] // read domain - ;; - add r22=IA64_DOMAIN_SHADOW_BITMAP_OFFSET,r22 + add r22=IA64_VCPU_SHADOW_BITMAP_OFFSET,r22 ;; ld8 r22=[r22] ;; diff --git a/xen/include/asm-ia64/domain.h b/xen/include/asm-ia64/domain.h index a77bb31856..fc97386408 100644 --- a/xen/include/asm-ia64/domain.h +++ b/xen/include/asm-ia64/domain.h @@ -259,6 +259,7 @@ struct arch_vcpu { unsigned long metaphysical_saved_rr0; // from arch_domain (so is pinned) unsigned long metaphysical_saved_rr4; // from arch_domain (so is pinned) unsigned long fp_psr; // used for lazy float register + u64 *shadow_bitmap; // from arch_domain (so is pinned) int breakimm; // from arch_domain (so is pinned) int starting_rid; /* first RID assigned to domain */ int ending_rid; /* one beyond highest RID assigned to domain */ -- 2.30.2